Merge from trunk.
authorAlan Mackenzie <acm@muc.de>
Wed, 18 Jan 2012 11:50:27 +0000 (11:50 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 18 Jan 2012 11:50:27 +0000 (11:50 +0000)
commit3981fa979cb8fd47849e67b0dd3a50efe249d397
treeaadab9984623ee93e071e4ecd770ab0fdf6b6fb0
parentd33f3073a2864a13e5890c638c76d3e345dfd1c9
parente862e57e35f5b3bac773344b2a438a9e9cad4f41
Merge from trunk.